From 0f216f8eb896e6c7de0ba33de743abb9d76cd0c3 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 6 Dec 2019 11:02:09 +0100 Subject: [PATCH] x86: don't offer Hyper-V option when "PV Shim Exclusive" This only added dead code. Use "if" instead of "depends on" to make (halfway) clear that other guest options should also go in the same block. Move the option down such that the shim related options get presented first, avoiding to ask the question when the answer may end up being discarded. While in the neighborhood also bring PV_SHIM_EXCLUSIVE into more "canonical" shape. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu Acked-by: Andrew Cooper --- xen/arch/x86/Kconfig | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 0a02b6ee3f..02bb05f42e 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -164,14 +164,6 @@ endchoice config GUEST bool -config HYPERV_GUEST - bool "Hyper-V Guest" - select GUEST - ---help--- - Support for Xen detecting when it is running under Hyper-V. - - If unsure, say N. - config XEN_GUEST bool "Xen Guest" select GUEST @@ -201,8 +193,7 @@ config PV_SHIM If unsure, say Y. config PV_SHIM_EXCLUSIVE - def_bool n - prompt "PV Shim Exclusive" + bool "PV Shim Exclusive" depends on PV_SHIM ---help--- Build Xen in a way which unconditionally assumes PV_SHIM mode. This @@ -211,6 +202,18 @@ config PV_SHIM_EXCLUSIVE If unsure, say N. +if !PV_SHIM_EXCLUSIVE + +config HYPERV_GUEST + bool "Hyper-V Guest" + select GUEST + ---help--- + Support for Xen detecting when it is running under Hyper-V. + + If unsure, say N. + +endif + config MEM_SHARING bool "Xen memory sharing support" if EXPERT = "y" depends on HVM -- 2.30.2